Move source code #99
Merged
Move source code #99
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Moved the Xcode project file, the xcconfig files and info.plists to the Resource folder. The distribution scripts where also moved to the Resource folder and the Cartfile.project and Github actions where updated to reflect the changes as well.
Moved all source code from the Source folder to Sources/OCHamcrest. Updated Package.swift and Xcode to reflect the folder change.
Updated slather configuration to use the new Xcode project path
|
Hmm. I like everything in Resources except for the xcodeproj. What do you think about moving that to the root? |
|
I was actually considering the same. I'll move the |
barkoded
force-pushed
the
feature/move-source-folder
branch
from
f15376c to
b4d0c98
Compare
Moved xcodeproj to the root of the project and updated files that depend on the location of the project file.
barkoded
force-pushed
the
feature/move-source-folder
branch
from
b4d0c98 to
274360f
Compare
|
This is the new proposed structure - what do you think about that? 
|
|
It's good! |
barkoded
added a commit
to barkoded/OCHamcrest
that referenced
this pull request
Jan 26, 2025
Previous pull request hamcrest#99 accidentally broke the xcframework script. This commit restores the functionality by adding the `-project` argument to the xcodebuild command which points to the location of `OCHamcrest.xcodeproj` in the root folder.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This pull request completes the transition to the default SPM folder layout. All files related to Xcode have been moved into the Resources folder which is located in the root of the project. We could consider deleting all the symlinks in the include folder and then move the actual header files to the include folder (but we can keep it as is for now).
The end-result will look like:
BTW Is there something we need to do for Carthage? I was looking at the
OCHamcrest.hfile and noticed this: